macos: Don't include gdkinternals.h

diff --git a/gdk/macos/GdkMacosBaseView.c b/gdk/macos/GdkMacosBaseView.c
index c4ba8c10204e541725af5da492bb8deec6d7da09..ddce1241a32ef7cacc3f7c8224cdbfd0eca6108d 100644 (file)
--- a/gdk/macos/GdkMacosBaseView.c
+++ b/gdk/macos/GdkMacosBaseView.c
@@ -25,11 +25,11 @@
 #import "GdkMacosBaseView.h"
 #import "GdkMacosWindow.h"
 
-#include "gdkinternals.h"
-
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacossurface-private.h"
 
+#include "gdkdebug.h"
+
 @implementation GdkMacosBaseView
 
 -(id)initWithFrame:(NSRect)frameRect

diff --git a/gdk/macos/GdkMacosCairoSubview.c b/gdk/macos/GdkMacosCairoSubview.c
index e52acdf168fa74632e5dc5daf21f26591e359d7c..af79f5e8790f14876c89042073fa7ef30c3b5bff 100644 (file)
--- a/gdk/macos/GdkMacosCairoSubview.c
+++ b/gdk/macos/GdkMacosCairoSubview.c
@@ -23,7 +23,6 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <cairo-quartz.h>
 
-#include "gdkinternals.h"
 
 #import "GdkMacosCairoSubview.h"
 #import "GdkMacosCairoView.h"

diff --git a/gdk/macos/GdkMacosCairoView.c b/gdk/macos/GdkMacosCairoView.c
index 81ac8af6a3ac41f3e15cdacf61fad293032fbf40..3e830c6a2847c2d696087f2800682507995404d8 100644 (file)
--- a/gdk/macos/GdkMacosCairoView.c
+++ b/gdk/macos/GdkMacosCairoView.c
@@ -24,7 +24,6 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <cairo-quartz.h>
 
-#include "gdkinternals.h"
 
 #import "GdkMacosCairoView.h"
 #import "GdkMacosCairoSubview.h"

diff --git a/gdk/macos/GdkMacosGLView.c b/gdk/macos/GdkMacosGLView.c
index 7945184c0bc03a7552f249501e0608a10087c116..d7f64374515fc2296df28425f174cfaf522ae245 100644 (file)
--- a/gdk/macos/GdkMacosGLView.c
+++ b/gdk/macos/GdkMacosGLView.c
@@ -23,7 +23,6 @@
 #include <CoreGraphics/CoreGraphics.h>
 #include <OpenGL/gl.h>
 
-#include "gdkinternals.h"
 #include "gdkmacossurface-private.h"
 
 #import "GdkMacosGLView.h"

diff --git a/gdk/macos/GdkMacosWindow.c b/gdk/macos/GdkMacosWindow.c
index 714a5047cd28b8ca318ca6067b1cf6aa56261d0b..750c21d966886308ef30395320477e7145bd6e7d 100644 (file)
--- a/gdk/macos/GdkMacosWindow.c
+++ b/gdk/macos/GdkMacosWindow.c
@@ -37,6 +37,7 @@
 #include "gdkmacostoplevelsurface-private.h"
 #include "gdkmacosutils-private.h"
 
+#include "gdkeventsprivate.h"
 #include "gdkmonitorprivate.h"
 #include "gdksurfaceprivate.h"
 

diff --git a/gdk/macos/gdkmacosdisplay-translate.c b/gdk/macos/gdkmacosdisplay-translate.c
index d64dd79e5be4c662b999507eb9c15d58b55bafb9..3400d0f9c36eeebc6a9f89fd98ee2be1f163ebeb 100644 (file)
--- a/gdk/macos/gdkmacosdisplay-translate.c
+++ b/gdk/macos/gdkmacosdisplay-translate.c
@@ -30,6 +30,8 @@
 #include "gdkmacossurface-private.h"
 #include "gdkmacosseat-private.h"
 
+#include "gdk/gdkeventsprivate.h"
+
 #define GDK_MOD2_MASK (1 << 4)
 #define GRIP_WIDTH 15
 #define GRIP_HEIGHT 15

diff --git a/gdk/macos/gdkmacosdrag.c b/gdk/macos/gdkmacosdrag.c
index 24e57a5965218caee4fe54516c1008f0e672f4d0..cd61c44e1ad847e32c1e45ae4e129612ec4ff60c 100644 (file)
--- a/gdk/macos/gdkmacosdrag.c
+++ b/gdk/macos/gdkmacosdrag.c
@@ -19,16 +19,19 @@
 
 #include "config.h"
 
-#include "gdkdeviceprivate.h"
-#include "gdkintl.h"
-#include "gdk-private.h"
+#include "gdkmacosdrag-private.h"
 
 #include "gdkmacosdevice-private.h"
 #include "gdkmacoscursor-private.h"
 #include "gdkmacosdisplay-private.h"
-#include "gdkmacosdrag-private.h"
 #include "gdkmacosdragsurface-private.h"
 
+#include "gdk/gdkdeviceprivate.h"
+#include "gdk/gdkeventsprivate.h"
+#include "gdk/gdkintl.h"
+#include "gdk/gdkseatprivate.h"
+#include "gdk/gdk-private.h"
+
 #define BIG_STEP 20
 #define SMALL_STEP 1
 #define ANIM_TIME 500000 /* .5 seconds */

diff --git a/gdk/macos/gdkmacoseventsource.c b/gdk/macos/gdkmacoseventsource.c
index b039d04615cc57b7ad0d750e424470e676d9f3fd..4ba14f26e4951a77d8f4d78a3b7ea1dc50be4506 100644 (file)
--- a/gdk/macos/gdkmacoseventsource.c
+++ b/gdk/macos/gdkmacoseventsource.c
@@ -27,12 +27,12 @@
 #include <unistd.h>
 
 #include "gdkdisplayprivate.h"
-#include "gdkinternals.h"
 
 #include "gdkmacoseventsource-private.h"
 #include "gdkmacosdisplay-private.h"
 
-#include "gdk-private.h"
+#include "gdk/gdkeventsprivate.h"
+#include "gdk/gdk-private.h"
 
 /*
  * This file implementations integration between the GLib main loop and

diff --git a/gdk/macos/gdkmacosglcontext-private.h b/gdk/macos/gdkmacosglcontext-private.h
index 533888cd2c63933896fec408dc6c652363987665..781035677a7039b123fb94534e5beba5d63982a2 100644 (file)
--- a/gdk/macos/gdkmacosglcontext-private.h
+++ b/gdk/macos/gdkmacosglcontext-private.h
@@ -24,7 +24,6 @@
 #include "gdkglcontextprivate.h"
 #include "gdkdisplayprivate.h"
 #include "gdksurface.h"
-#include "gdkinternals.h"
 
 #include "gdkmacosdisplay.h"
 #include "gdkmacossurface.h"

diff --git a/gdk/macos/gdkmacosglcontext.c b/gdk/macos/gdkmacosglcontext.c
index cc0b5fab15e2655a3f808982626793f8096ddf9d..09da35b69a617a48dc835b8899a914c11ea189bf 100644 (file)
--- a/gdk/macos/gdkmacosglcontext.c
+++ b/gdk/macos/gdkmacosglcontext.c
@@ -23,7 +23,6 @@
 #include "gdkmacossurface-private.h"
 #include "gdkmacostoplevelsurface-private.h"
 
-#include "gdkinternals.h"
 #include "gdkintl.h"
 
 #include <OpenGL/gl.h>

diff --git a/gdk/macos/gdkmacospopupsurface.c b/gdk/macos/gdkmacospopupsurface.c
index 60239d72ed83fbbeab00a8faf204866ab86a6f51..6f79b6d31b0bd2093757fdc1018b7d6cf37778ae 100644 (file)
--- a/gdk/macos/gdkmacospopupsurface.c
+++ b/gdk/macos/gdkmacospopupsurface.c
@@ -21,12 +21,13 @@
 
 #import "GdkMacosWindow.h"
 
-#include "gdkinternals.h"
+#include "gdkmacospopupsurface-private.h"
+
 #include "gdkpopupprivate.h"
+#include "gdkseatprivate.h"
 
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacosmonitor.h"
-#include "gdkmacospopupsurface-private.h"
 #include "gdkmacosutils-private.h"
 
 struct _GdkMacosPopupSurface

diff --git a/gdk/macos/gdkmacossurface-private.h b/gdk/macos/gdkmacossurface-private.h
index 8a5ee526fa91737cd7aaf757d45c93474be0a9f7..e65505f8a918af7f8a477e5ce855e25be42435e4 100644 (file)
--- a/gdk/macos/gdkmacossurface-private.h
+++ b/gdk/macos/gdkmacossurface-private.h
@@ -23,7 +23,6 @@
 #include <AppKit/AppKit.h>
 #include <cairo.h>
 
-#include "gdkinternals.h"
 #include "gdksurfaceprivate.h"
 
 #include "gdkmacosdisplay.h"

diff --git a/gdk/macos/gdkmacossurface.c b/gdk/macos/gdkmacossurface.c
index 88be1f513de7e81fccb1733c51bf9bc45c8ec0ec..f94eaa2eca2be2e483820f7a6ae56fda456a5b8c 100644 (file)
--- a/gdk/macos/gdkmacossurface.c
+++ b/gdk/macos/gdkmacossurface.c
@@ -25,10 +25,13 @@
 
 #import "GdkMacosCairoView.h"
 
+#include "gdkmacossurface-private.h"
+
 #include "gdkdeviceprivate.h"
 #include "gdkdisplay.h"
+#include "gdkeventsprivate.h"
 #include "gdkframeclockidleprivate.h"
-#include "gdkinternals.h"
+#include "gdkseatprivate.h"
 #include "gdksurfaceprivate.h"
 
 #include "gdkmacosdevice.h"
@@ -39,7 +42,6 @@
 #include "gdkmacosglcontext-private.h"
 #include "gdkmacosmonitor-private.h"
 #include "gdkmacospopupsurface-private.h"
-#include "gdkmacossurface-private.h"
 #include "gdkmacostoplevelsurface-private.h"
 #include "gdkmacosutils-private.h"
 

diff --git a/gdk/macos/gdkmacostoplevelsurface.c b/gdk/macos/gdkmacostoplevelsurface.c
index 947d0b20d2092715f8384d7f6b0b4ed37360b4e2..17b1cec7085313ea840d7a613a0320f783e60d5a 100644 (file)
--- a/gdk/macos/gdkmacostoplevelsurface.c
+++ b/gdk/macos/gdkmacostoplevelsurface.c
@@ -21,12 +21,13 @@
 
 #import "GdkMacosWindow.h"
 
-#include "gdkinternals.h"
+#include "gdkmacostoplevelsurface-private.h"
+
+#include "gdkseatprivate.h"
 #include "gdktoplevelprivate.h"
 
 #include "gdkmacosdisplay-private.h"
 #include "gdkmacosmonitor-private.h"
-#include "gdkmacostoplevelsurface-private.h"
 #include "gdkmacosutils-private.h"
 
 static void